From: Jonathan Lebon <jlebon@redhat.com>
Date: Wed, 16 Aug 2017 13:10:39 +0000 (-0400)
Subject: ostree-deployment.c: simplify equality check
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~33^2~9
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fa3a31af92ec5e15d58253bd20753f6ccb07b042;p=ostree.git

ostree-deployment.c: simplify equality check

Just a random cozy patch I made while perusing the codebase. When
determining if two OstreeDeployment objects are the same, rather than
just checking for NULL, we can just directly check for equality of
pointers to also catch the trivial case.

Closes: #1082
Approved by: cgwalters
---

diff --git a/src/libostree/ostree-deployment.c b/src/libostree/ostree-deployment.c
index 9fb5b028..78afe18c 100644
--- a/src/libostree/ostree-deployment.c
+++ b/src/libostree/ostree-deployment.c
@@ -160,7 +160,7 @@ ostree_deployment_clone (OstreeDeployment *self)
       new_origin = g_key_file_new ();
       success = g_key_file_load_from_data (new_origin, data, len, 0, NULL);
       g_assert (success);
-      
+
       ostree_deployment_set_origin (ret, new_origin);
     }
   return ret;
@@ -187,8 +187,8 @@ ostree_deployment_equal (gconstpointer ap, gconstpointer bp)
 {
   OstreeDeployment *a = (OstreeDeployment*)ap;
   OstreeDeployment *b = (OstreeDeployment*)bp;
-  
-  if (a == NULL && b == NULL)
+
+  if (a == b)
     return TRUE;
   else if (a != NULL && b != NULL)
     return g_str_equal (ostree_deployment_get_osname (a),
@@ -196,7 +196,7 @@ ostree_deployment_equal (gconstpointer ap, gconstpointer bp)
       g_str_equal (ostree_deployment_get_csum (a),
                    ostree_deployment_get_csum (b)) &&
       ostree_deployment_get_deployserial (a) == ostree_deployment_get_deployserial (b);
-  else 
+  else
     return FALSE;
 }
 
@@ -236,7 +236,7 @@ ostree_deployment_new (int    index,
                    int    bootserial)
 {
   OstreeDeployment *self;
-  
+
   /* index may be -1 */
   g_return_val_if_fail (osname != NULL, NULL);
   g_return_val_if_fail (csum != NULL, NULL);